Added addtional functionality