Fixed babies modules
Merge branch 'fixed-babies' into develop