still fixing stuff