intermidiate commit to combine Chris's code
bad commits again