Added first logic