Making changes JK suggested