some of #916

@ninjalulz I still need help of what to put here xd