and some select changes lol