Added functionality to working base version