Working on resolving the problems