added : some brand new bugs