Changes made after finished debugging