new working release based off isra17's branch