Capstone project version 2