Pull Alegend45's latest changes