pull austin's changes
merged conflicts
merge
merged
added punish user function