fixed CS error - only extracted some mothods to reduce the complexity and lenght of mothods
fixed CS error
fixed CS error
fixed CS error
fixed CS error