Updated to version that supports popouts