Design implemented and backend logic improved