got rid of header, and refatored model names