Edited the models v2