ACTUALLY make this work on a wider range...