nicole's fixes