Code adjustements