updated for spring with some optional details