added more functionalities und so.. weisch