Working on some changes and experimental testing