added stuff that makes eclipse work