fixing stuff take #2