working on this again. making it for 1.8