Fixed logic and added in start of card logic