More changes on found code