Added resolving of conditions first couple of types of conditions