removed regression & dryed a bit