(Angrylion/hatcat RDP) Some more changes