bug fixing in progress