Made some basic changes to manage