changed code structure to 02