ALL OLD BUGS - FIXED [VERSION 0.2]