added has_one line and more