Fixed all bugs !