Fixed stupid error.. Code merged into one file