Fixed a nesting issue
Added message displaying