Updated whats working and not