added ready to merge things