making it all work properly