#16 changes applied