Pete said would be nice to have this
Can remove