updates to make it worky