some functoinality fixed