Updated Version to be ready for further features ;)