Fixed non working stufff