started working on fixing build