[Anton] Adding some extra things to do