Did some changes to butler