updated pro + added unfinished work