make amends to the model used before. Simplified the implementation