Added a coupe of changes