Fixed mega bug. commiting to develop