final tweaks -- this acutally works ahahhahhahaha