Added some cs4536 code