first 2 problems added