Enhancements

Making some enhancements