Changes based on Bugs