switched back to working model