MB-18
revisited the stored procedures and adjusted the code as per the
requirements.