6/18 Methods added