Added done functionality