still fixing model issues