Refactored effects slightly. Unfixed the incorrect bug fix...