changes suggested by @SUTJael