Adding more analysis stuff