updated with wip build