Remember to check for second param