added stuff... works :)