yeah that can be improved :-)