Attempting to modernize a wee bit