merging
merged
merging
refactored, put jumping online