Fixed all wished items. Hopes it will pass