stuff up to now
added new stuff