Added full reverse support