Updating code - still working on it