added few lines as proof of concept