change signature as David suggested