Improve Noobia even more