few updates - not happy with this