Bugs fixed, if worked