Now cleaned up stuff, sorry about the last one. This should work