Added updated funcionality
Added updated funcionality