Issue32 suggested changes