Added the tricky initial conditions

Made syntax more consistent