Changed more logic around