V 0.0.2-2 (Codyd51's changes)