Added better grab code