* Fixing BUGS