WIP. Removed bottle necks.