final commit

haven't done any checking, just committed as it is