tested and added some fields to models