Finished 1.3:  added boolean