More features: Working code before implementing notification for calling window