added changes to try and fix user