improvements on the real machine