added more funcionality