Added new code to be reworked