Updated after implementation