No more hard coding! Added actual signature grabbing