Some improvements + setting first attempt