more functionlity done