some changes... sorry about that