We try to improve and fix Armins features