fixing last night's changes