Make it 1.8 compatible and slightly faster