Attemp to fix moving origin bug & removed slick