First attempd to adapt the classes completed