canged user class and added null objects