Updated to work with 6