Changed blocking problem and added logs