still trying to fix this mess