Move functions to models Continued