cleaned up buid - very good