fix
started functionaloty