added annotate for better documentation
added more information to user and fixed model
fixed merge conflict in model