Added - better loggin throughout