new changes
@commit: resolving errors