final version with workable fixes