now with all user changes