All bugs FIXED