added bools, typing