messing around before merging jeff changes