half baked changes...