added floor and redesigned inital conditions