stuff that will clash with chris changes. will fix
resolved comflix