First attempt at rectifying problems