pre final version - need to improve graphycs