finish but with bugs in modeling-users