Added more funcionality.