modified some.. and done build.