redesigning started. added spring