my fixes for now