removing stupid type checking and doing something a little better