more modification for my user