merged with Andrew's code

adds nothing :(