Made some enhancements