changed some stuff around to make it work together