Test + code big update