more changes.... i think