modified for development in eclipse