more code revisions..