More additions, modifications