added some more functionality - time is running out :-D