update with Paddy's changes