Change to use function CGPointMake and CGSizeMake