TEMPORARY NOTES (rebase out)