Minor changes to prev code change