adding more funcionality