will merge in final solution soonish