Removed old code. Added message cases