some wip changes..