removed testing code sigh..