Shapes fixes less round time
merge fix