add exceptions
continue working