Without adapter

Tested and working