fixed ...library and cafeteria