Added effect presentation and imported some fixes