Added procedures and fixed success message