FIX all the messy stuff