some stuff related to my previous commit, forgot to commit