Added notification functionalit - NOT TESTED
Added UI interaction