All bugs resolved!!!!