Added second bay - UNTESTED