updated with current WIP code