cleaned up this branch a little