Reformatted project, simplified model