Fixed expand and effects