updated for spring
EOY setup