More preparation work for angrylion