New pop ups fixed + Charlie fix