Updated with Current and New Features