Changed method requirements and stuff