bug fixing, adaption