woking on some functionalit