New Version 0.5

Reworked