Implementation fixs