[am]improved code