minor modifications
...-.-