Working Solution V.1 with remove