cleaned up and configured