Fixed some things - final version 2.0