fixed some of bella's new code