#22 Added Features 2